Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge ign-gazebo6 ➡️ gz-sim7 #2288

Merged
merged 20 commits into from
Jan 17, 2024
Merged

Merge ign-gazebo6 ➡️ gz-sim7 #2288

merged 20 commits into from
Jan 17, 2024

Conversation

azeey
Copy link
Contributor

@azeey azeey commented Jan 17, 2024

➡️ Forward port

Port ign-gazebo6 ➡️ gz-sim7

Branch comparison: gz-sim7...ign-gazebo6

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

azeey and others added 20 commits October 3, 2023 18:38
The Fuel model being tested has been updated on the Fuel server tests
fail without this fix.

Signed-off-by: Addisu Z. Taddese <[email protected]>
…des test

Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Merge ign-gazebo3 ➡️  ign-gazebo6
Signed-off-by: Ian Chen <[email protected]>
…zebosim#2176)

Signed-off-by: ashbabu <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
Co-authored-by: Michael Carroll <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
…sh_fix

Backport ActorTrajectoryNoMesh test fix
* Use on `push` only on stable branches to avoid duplicate runs
* Update project automation

Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Merge ign-gazebo3 ➡️  ign-gazebo6
…th Garden and later (gazebosim#2275)

Allows using gz-* in plugin filenames (eg. <plugin filename="gz-sim-physics-system" name="gz::sim::systems::Physics"/>) and using GZ_* environment variables in Fortress. This is meant to help users (especially ROS users) maintain SDF files and launch files that work in both Fortress and Garden/Harmonic.

---------

Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
@azeey azeey requested a review from mjcarroll as a code owner January 17, 2024 02:31
@azeey azeey self-assigned this Jan 17, 2024
@github-actions github-actions bot added the 🌱 garden Ignition Garden label Jan 17, 2024
Copy link

codecov bot commented Jan 17, 2024

Codecov Report

Attention: 17 lines in your changes are missing coverage. Please review.

Comparison is base (926923f) 64.76% compared to head (5a76b28) 64.72%.

Files Patch % Lines
src/Conversions.cc 15.00% 17 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           gz-sim7    #2288      +/-   ##
===========================================
- Coverage    64.76%   64.72%   -0.05%     
===========================================
  Files          357      357              
  Lines        29140    29160      +20     
===========================================
+ Hits         18873    18874       +1     
- Misses       10267    10286      +19     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@azeey
Copy link
Contributor Author

azeey commented Jan 17, 2024

I've opened #2291 for the test failures in the Jammy Github Action. I don't think it's related to this PR, so I'll go ahead and merge.

@azeey azeey merged commit c6cd6ed into gazebosim:gz-sim7 Jan 17, 2024
8 of 12 checks passed
@azeey azeey deleted the 6_to_7 branch January 17, 2024 16:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🌱 garden Ignition Garden
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

5 participants